//
//  ViewController.m
//  GitManagerTestDemo
//
//  Created by Felix Yin on 2017/5/4.
//  Copyright © 2017年 Felix Yin. All rights reserved.
//

#import "ViewController.h"

@interface ViewController ()

@end

@implementation ViewController

- (void)viewDidLoad {
    [super viewDidLoad];
    // Do any additional setup after loading the view, typically from a nib.
}


//添加碰碰功能开发
- (void) addFriend{
    NSLog(@"添加好友功能");
    //确认没问题 从发布版本合并到 master 分支
}

- (void) fixbug{
    NSLog(@"bug修复完成");
}


- (void)didReceiveMemoryWarning {
    [super didReceiveMemoryWarning];
    // Dispose of any resources that can be recreated.
}


@end
